Merge upstream changes #2272
Merged
Merge upstream changes #2272
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… logged-in account (mastodon#25669)
Co-authored-by: Sam BC <samuel.balbirnie-cumming@xdesign.com>
Port 54a1052 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port d9a5c1a to glitch-soc Co-authored-by: Sam BC <samuel.balbirnie-cumming@xdesign.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 6268188 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 000b835 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port b7910bc to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
…nsistency Port 54cb679 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Port 69e124e to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Conflicts
None
Ported changes
Skipped changes